Open
Conversation
Only treat #if config blocks as conditional imports when they contain imports exclusively. This preserves existing import parsing while allowing the visitor to traverse blocks that contain @mockable protocols or other declarations.
sidepelican
reviewed
Apr 8, 2026
Collaborator
sidepelican
left a comment
sidepelican
left a comment
There was a problem hiding this comment.
Hmm, I think the containsOnlyImports approach is a bit tricky.
Ideally, I'd like to generate mocks while preserving the structure of the #if directive.
Without #if, isn't it just a coincidence that mock implementations can be used?
AnthonyTTaylor
force-pushed
the
bugfix/ipconfig-skips-protocols
branch
from
900f675 to
bd45f5f
Compare
Author
|
Had to add a missing closing bracket - sorry about the delay.
I'll dive in and see about preserving the structure of the |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR fixes a regression where protocols (and other mockable entities) inside #if blocks were not being discovered for mock generation. The issue was introduced by changes in PR #328 that made the visitor treat all non-fileMacro #if blocks as conditional import
blocks, even when they contained declarations like protocols.
Problem
For non-fileMacro #if blocks, the visitor now always:
This is correct for import-only blocks, but incorrect for blocks containing declarations. In those cases, protocols, classes, and other declarations are never visited, so mockable entities are not discovered.
Solution
Only treat an #if block as a conditional import block when it contains imports exclusively.
Added a new recursive method containsOnlyImports in EntityVisitor that checks if an IfConfigDeclSyntax contains only:
If the block contains anything else (like protocol, class, etc.), the visitor now returns .visitChildren so entity discovery proceeds normally.
Behavior After This Change